Feature #64, refactoring test