Reorganizes test files
Adds tests for toolbar methods