Added tests and marketer's section