Refactor unit tests because of refactoring of Interfaces