Fix cleaning up after tests