fixed several test failures