Small HTML updates and some tests