added more test cases from book and sf