Finished the RecordTest. All ok.
Removed TODOs.