rearrange tests, fix loading of classes
Merge pull request #42 from theckman/rearrange_tests

rearrange tests, fix loading of classes