Fixing spec_helper, new urls and domain support
fix merge conflicts