Cleaned up UTs
Merge branch 'master' of https://github.com/alanwagner/FhSiteKit