refactored test
Merge pull request #1 from kolodny/refactor-tests

refactored test