MAESTRO-3202 Attempt to get unit tests working again