Tests for refactoring, plus fix for package refactor problems
5 files changed