Changes to get the testcases running.