Merge "test_shelve_instance: cleanup class scope variable usage"