Upgrade insight tester

Lots of improvements, requested and otherwise.