Fixes and adds tests
Fixes and adds tests

joeyAghion/force,anandaroop/force,damassi/force,oxaudo/force,xtina-starr/force,eessex/force,dblock/force,erikdstock/force,eessex/force,artsy/force-public,kanaabe/force,damassi/force,erikdstock/force,xtina-starr/force,kanaabe/force,izakp/force,eessex/force,artsy/force,izakp/force,oxaudo/force,yuki24/force,mzikherman/force,joeyAghion/force,joeyAghion/force,artsy/force,izakp/force,cavvia/force-1,cavvia/force-1,joeyAghion/force,kanaabe/force,artsy/force,erikdstock/force,xtina-starr/force,TribeMedia/force-public,xtina-starr/force,anandaroop/force,mzikherman/force,oxaudo/force,damassi/force,yuki24/force,artsy/force-public,artsy/force,TribeMedia/force-public,eessex/force,cavvia/force-1,anandaroop/force,yuki24/force,dblock/force,yuki24/force,kanaabe/force,mzikherman/force,erikdstock/force,mzikherman/force,damassi/force,kanaabe/force,anandaroop/force,cavvia/force-1,oxaudo/force,izakp/force,dblock/force