Tests: Added additional tests.