html and tests tidying