Updates to tests and framework.