Fixfailures

Fix test failures.