Fixing query and empty test.