finished fixing all failing tests