chore(engine): code cleanup / test refactoring

related to CAM-2629