More tests and fixed user log in to decide between current user and any logged in user