More tests, revised tests.
Fixes, auto text generation stub.