Split tests up unto unit and acceptance; included a dying server tool I wrote to aid acceptance tests