NXP-15648: small cleanups
NXP-15648: add more unit tests to confirm that override behaviour on inner page provider is working ok