Added unit test for complex query
Updated README and added more unit tests