Tricky test cases now pass just fine! (not possible with spirit-2)