Tests integrated. Hunting segfaults.
Segfaults eliminated. Now just hunt the bugs.