Added support for advertisement. All active test advertisement should now work correctly.