restructured tests
restructured tests
Merge pull request #28 from nbr2/master

refactor