Added two more tests
Turn HS stuff into test suite