Fixing compile errors in the unit tests