Feature #53, refactoring test