Fixed the unit tests to be able to build and run again