test push
Tests should work now.
Temp comment to push server test code.
Minor formatting of code and put the test back for post deploy.
re-merged master with all appropriate branches.
Merge pull request #161 from Adron/master

Fixed the test on the *test* server.