Fix login link name; Clean up failing tests slightly