[CB-4036] - refactored the engine/version checks for easier testing