more testing, more fixes; removal of single-except rule