Adding billboard classes and the effect tests