multiple changes

added tests and html services