Code rewrite again...

Makes quite a lot of code rewrite.

Anyway. Soft asserts are the way to go. All test code will eventually be
converted to use that.
More tests converted
More tests converted