#26 fix failing tests