Added more tests for guide, also an alternative guiding way, closes #13