More tests built from test file data. Fix exception signatures.