tests + fixes for previous commit