More work on 11.3 and making the tests work