more tests + format