fixes for attributes test etc