Adding more tests and removed query for now.