Added movement pattern to new EnemyTypes.
Fixed tests
Fixed merge conflicts