Replace test add-on.
Update tests to sync up with last change.