Made modifications for test