Follow feature passing tests again following merge