Added some more tests.

Some of them trigger uncommited bugs.