Unified Test behaviour. Added tests for deployment