Fixed goForThree and added more tests