Fixed test units against latest changes