Allow ext3 or ext4 for root partitions, and general cleanup of the various tests