revamped test suite to allow for quick additions