Remove autogenerated unit test
Refactor to extract RecordHandler interface.