Updating tests to account for form login
Renaming services