Removed call to confidentialString - self-modifying test code is really hard, and the values are no secret.
Rewritten most tests for ease of use and clarity.