Fixing tests to match PR from adamwitherspoon

Signed-off-by: Jason Myers <jason@jasonamyers.com>