one more test case, more bugs found&fixed