more and better tests
1.3.6