new tests + some improvements