pushed a couple changes from markup_test to html5_test