minor testing improvements