refactoring unit test for #35