add more tests

Detailed comments available in all commits...