Remove the last bit of shared state in test