Refactored tests + added some more