Cleaned up HTML, made the test a bit better