rename by_site to for_site
do NULL check first in for_site
Added specs for multisite functionality