Tidy up in prep for bootcamp.
When testing more than one expectation, we first test for the warning,
and then test for the value.
http://stackoverflow.com/questions/20885845/testthat-handling-both-warning-and-value
my merge
my merge