Bettertesting

Alex, incorporated your suggestions (which I greatly appreciate - as well as the info behind them)

Let me know if this looks better/ready to pull or needs more attention.   Thanks!