Created demo test suite, updated implementation of non-demo suite