Move ManualSet -> Set method and update all tests to be passing