updated game model and added tests