Refactored tests, updated changes