fix test expected string and ensure that command string has valid format
Merge branch 'add_standalone_master_record'