cleanup the test suite to be more maintainable
added support for admin party