tests + fixes cont.