Update to add testing