Slight refactoring of gameScreen and added a few tests