Everything compiles
Some test fixes