Add test for terms-filling