fix two more Unit Tests