test updates

- move several tests from stateful to stateless (judgement call on the
validity of being stateful)
- updated logic to allow for test completion and reliability
ref #3