Fixed broken stuff from last commit. Added unit tests, moved data into gameData.
Merge pull request #1 from Limyc-/Branch_600ae35c22f96f5ef9215f8c09f7bf484e9789d3

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