more testing improvement