Implemented additional tests.