Enhancements plus new tests