#9  tests fixed.