Made better usage of game object. Unittests currently broken from last commit. Closes #24.
Fixed broken unit tests.