now passes all tests on snapshot