fix the unit tests too.