updated after passing all 3.2.5 tests
Got all tests running up to 3.2.5