Additional testing infrastructure
Also started framework for next Knight test