more tests and simpler descriptions of tests