Added remainder of existing unit tests.