Remove spaces and merge tests into one file