Proof of concept working against ‘new_m13’ branch

* Tests behave more-or-less as expected (which means some are failing)
* Incorporate feedback from Marv