Fixing some validation issues and adding tests for home church model