Updated tests: split into multiple tests and isolated each comparison in a separate query