Update tests + add username field