Fixed shutting down/testing