Moved test queries to better organizational method and updated test controllers to new method.