fix unit tests for the latest change