fixed broken build and  unit tests