Making changes for fields/types with spaces in from, where and order by. Adding tests for the changes made