Minor modifications
Fixed tests.