Refactored tests. Thanks Guy!