Additional enhancements while testing