Refactoring enemy spawner
fixing merge conflicts / making tests pass again