As per suggestion @basvodde.
Re-instate NullTestShell for testing purposes.