cleaning up guesser, adding tests.