Added tests addressing Todd's comment in USERGRID-1251.
Refactored tests into their own file.