some testing improvements