Improvements testing

update from testing merge