improved guatd detection, more tests, better test matching in guard