Test refactor
Merge pull request #2 from darkl/master

Test refactor