#7 fix failling tests.