Threads get



Tidies up https://github.com/buddycloud/buddycloud-server-java/commit/30ee9f42d695f823eb2ca795114081e23a83851a and https://github.com/buddycloud/buddycloud-server-java/commit/2b9a9dee2d81b8ac5e0151dd9a3921978f83fabb

Also sorts out memory issues on running tests