added several more tests