enhancements & tests