NXP-12834: align on 5.8-SNAPSHOT + fix first test (almost)