Fix all failing tests