Fix and test statement attributes