Corrections and additions to tests