Added failing test. Fix involves looking for typevars.