Context shutdown added to tests