Update to enable testing