Add test to catch bug #20
Remove remaining, unused function.