Further improvements on getting Unit Tests working, as well as Delete tool improvements.