#117 Continuing to make testing more self-contained.