Fixing WorkSite tests and views #3