Reformatting and removing zombie test