implemented many more tests
fixed merge, but problems with login found
fixed merges