Refactored testing because it didn't update