Fix test case that was passing incorrectly and fix merge issue