Refactoring html tests!