Add banners. Make test more backward compatible.