more modifications to noAds support: updated unit tests so it reflects Oasis behavior