Added in system.shutdown to tests