Fix failing test.
The internal package should not exist in test either.
Fix merge conflict.