-Indirect buffer tests
-Added some iteration for query (need to find better still)