WIP, improve test coverage, work kinks in test flow control