added mount-based tests, hardened shutdown routines