append tests and change some exceptions