Updated tests, modified loginactivity slightly
Merge pull request #39 from Eduki/more_tests

Updated tests, modified loginactivity slightly