bcallah@ improvements.
PLIST fixes.
Tests are bogus, I should fix them.