reorg: splitting testing and loading into more logical classes.