Added tests authentication
merge fix
fixed merge