Cleaned up a little of DBQueryTest