Added test queries. This resolves #6 and adds a bit to #2