#45 fix failing tests