refresh mocks & rm redunce set/reset; add rmrf err test