Fixed bug with av creator + added tests