Adapted unit test as well.