Added more tests and fixes for spaces