Updates to tests, Ctrl and html