Improve error message.
Disable legacy tests.