improved error message for illegal bonus/manus for #16
renamed testcase for #16
added testcase for #16
added testcase for #16
added testcases for #16