finalized adding an ad
Fixed trackable tests that failed due to bad design
fixed some more tests that failed due to the same faulty design