few fixes for the unit tests