Modification for other tests