Minor changes
Added validation and test for numbers required in password, plus minor changes of upper case to uppercase