updated test html, general refractoring for readability