more testing improvmenets