fix broken unit tests are a result of the last merge