Refactored testing and core
Massive start/stop refactor
Some style cleanup