Added/Refactored some more tests