important bug and test fixes; clear exception if CH restrictions are violated