Reworked Unit Tests to support querying