Made testing server a tiny bit more efficient