reorganize test functions
Merge pull request #16 from nens/fedor-cleanup

reorganize test functions