Refactors tests so they're all green, optimizes the first two moves so the algorithm is lightning quick