All compiles, fixing unit tests