More unit tests to cover queries