master
Some more tests