[Unit Tests] Refinements

* Dispose Shells when created
* Correction