removed moq refs, stabilised shutdown tests