More testing improvements