Made OneTurn function and tests for it + some refactors