Started adding query-based unit tests