added some more test material; added some more tests