So this fixes the problem I mentioned earlier with the test (changes the domain by string).  

I don't know if this is too underhanded or bad practice to override domain_name here.  This is approaching the limit of my knowledge.

![i-have-no-idea-what-im-doing-dog-gif](https://f.cloud.github.com/assets/429763/1586590/dc82ac74-522a-11e3-918e-42e52aec5bdd.gif)