First Refactoring Unit Tests (preparing v2.0.0)