Added unit tests and split up game classes