fix previous merge; fix unit tests