Add a whole lot of debug goodies
Make sure the unit tests pass correctly