Fixing exceptional tests