Fixed broken stuff from last commit. Added unit tests, moved data into g...

...ameData.