Last tests

This also includes JS fixes that came from new HTML