fix broken tests; break out RecordValidator