Update tests + some fixs.