This reverts commit d9246b1ec0a1400af86bbe7595712343cdbdc0af.
Fixed tests