Add deactivation tests
Flesh out initialization tests