Fixing test cases after the reorganization