split 19 and 20 tests. simplify reraise of type error