removed var that was not needed
separated objects and player, same with tests