Statement tests & fixes