Implemented more self-tests.