Add further unit tests.