Cleanup
Merge remote-tracking branch 'origin/feature/gmockTestEnv' into develop