Sorted the deadlock in the tests out now I think, good times.