space replacing and removed test overrides