Revert "New test fixtures"

This reverts commit e14df80923ed1fc90882c064af12236e116b20a6.