More tests

Also refactored gameScreen.py so look at that before accepting too.