consolidated test html into test.html
merged