more tests + minor fixes