Query objects, added class and test from post