properly test new website validation logic
Merge branch 'enhancements'