Removed over-testingand changed registry access