Fix tests + big fix in getCurrentUsername