Start modifying test 32a, 32b (currently disabled) to handle 1.8->2.0
filesystem upgrade test.