Squashed commit of the following:

commit d38db7346954fc342edbea7b18ddc6cce3088fe4
Author: Dan Olson <olson_dan@yahoo.com>
Date:   Mon Aug 18 22:07:10 2014 -0500

    Remove unused variable in test and update assertion