added suite creator, refactored