De listing and beautify test html and then some

Please see line comments.