Added two (yet another) new selfchecks.
Add three new basic tests.