Fix some failing tests related to #10