space replacing and removed test overrides
Merge branch 'dev'