Bug Fix: Get/Set now passes all tests