Test enhancements