NXP-12233: fix randomly failing tests? + remove deprecated stuff