Simplify suite
Add tests for suite