few more tests + minor fixes