Updating so that asserts in tests are passing the parameters the right way around.