more testing improvements