Morozov testing and fixes