Added this and additional tests.