Spent some time cleaning up the tests. Certainly they could be made even better & made to test more things, but at least they pass now :)
Much of the change was deleting copy & paste, and deleting commented out tests: 53 files changed, 941 insertions(+), 2610 deletions(-)