Added option to enable/disable item expansion and updated test Activity