test suite errors corrected