Fixing last test failures from set/get tests.