rejiggered suites, added tests