Wrote more unit test #2 and start working on the query configuration #3.