More progress towards testability, but not there yet.