more message tests, refactoring
Refactor cs_global -> ToolBox
Working on controller & some test files