Updated code so that all the tests at least compile.