Fix upgrade unit test to drive public API