Minor testing improvements