Adding/Refactoring unit test