Merge all files and add updates for Metro Test UI