Refactored test suite. Fixed an improper finally block on deletion of registry keys.