UPDATE: Refactoring unit test to use stub