Added unit tests for the rest of the queries