Added more rigorous queries. Started tests.