Fixed and tested undeployAll
Added more tests for options classes and fixed a few bugs along the way