Added testsuite name tagging of servers, bumped version to v1.6004, move sending of kill to inside the error handling