Added new selfcheck.
Renumbered some tests.
Added various new test cases.
Added various new test cases.