Updated test cases and cleaned up, test adding user with admin role as a customer fails, and saves as customer instead