fix unit tests v2