Reorganize tests
Fix errors that the auto "Refactor" caused
Fix some testing queries having to do with the "versions" parameter