Added more classes and exceptions to make the first set of tests build.