Updated tests, modified loginactivity slightly