NXP-11364: use correct regex
NXP-11364: update tests to use new API