MEDIUM / Fixed some unit test after refactoring