Stub some tests
Hack in some querying