Remove demo shims.
Add test package requirements.