Fix RecordStore API test failures