simplify and improve test
start adding tag-based connections