Remove dead code
Add missing require
Change the test to differentiate between them.