Fix up tests
Booting problems went away, probably due to par choices - expect them to return!