Merge branch 'refactor'
fixed Player, Obstacle, Shape tests

- added Mock
Merge branch 'test'