Add HTML tests back in
More cleanup of files/dirs generated during tests