refactor specs for new site flow

All specs passing