Various fixes for current test failings #234

Closed jhesketh closed 3 years ago