#master: more tests