align the code base in unit test