make the tests build; two exception related tests are failing, though.