new tests + fixes