Move tests into package.
Bit of cleanup.
Update manifest.
Merge branch 'test-split'
Fix line length.