Fix failed tests: Mostly a case of later changes to the test files that needed to be retro-fitted to the new test framework.
Latest changes in the fixtures data in devel incorporated on the branch.
Swap file should not have been there in the first place.