Fixing test cases after the reorganization
6 files changed