Remove deprecated code, add BPE variable tests
Remove deprecated code, add BPE variable tests