Tests refactored
Tests refactoring to apply code (package) structure changes.