Updating to support the new method of testing