Add additional matchers and finish implementing planned spantree tests.