main code updates to do HTML5
Update of some test cases