Reference new component
Change StateManager to be a singleton object
Removed a redundant blank line
Updated tests to be vaguely more relevant