minor test tidy-up - esp remove unused vars