Refactor and update tests.

Added a GameObject