Slight clean up and tested maturity level and corrected login/success
cases