#5034 Add tests for handler / operations architecture