Override PR

Should be able to just cherrypick the additional feature test. Not sure how to get github to only send the 1 commit.