Enumerator tests again and small refactoring started
Conflict...j
Merge branch 'master' of https://github.com/STzvetkov/KingSurvival5