Converted more tests to Test::Routine

All tests through the first 6 are now based on Test::Routine roles. This
achieves significant de-duplication