Add test2 and fix a BC bug.