Moved validation to increase code re-us
Enum for Current = 0 and Voltage = 1
Validation tests