Use new testing facilities from vumigo_v01

Means we can remove a lot of junk from the test file.