Improved test coverage
Prelim fixing up of scripted tests and harmonisation of scala versions.