Fixtests

Reduced number of test errors.