Guess Button removed
Finalizing refactoring and tests