renamed method, added tests
moved query for all columns to toolstorage, added test