Added in additional tests.