Updating test suite to make use of API tests.