Implemented some additional tests.