fix all failing tests