rearrange tests, fix loading of classes