Testall fixes

Two fixes to ``testall`` in order to make it more useful for masterfiles testing.