Fix a couple more test cases for #148