test96: Updated accordly for recent changes