Enhancements and tests