Add Record composer
Fix some test