enhancements and tests