adjusted <HOST> regexp to match all test cases
added some v6 test cases