resolved conflict with master
added test for guessables