Revert "Test fix attempt vol. 1"

This reverts commit 57600548da063fd57d884e598e7bafd0116d06d5.
Revert "New tests."

This reverts commit 2cd5162534362e5548d2b1d1ed367cea04a51e03.