Various fiddles and a grid figure.
Clearer naming scheme for test codes.
More clean up.