Fix tests to accomodate variable name changes