Minor changes and first steps for aunthentication (Tests)