Tidyup

Proposed updates to modernise code. A few more updates to come.
I must prefer the RSpec pattern of adding the test dir to the load path, and requiring files relative to that.