typo
Add more indexed tests
add more Indexed tests
refactor TFR, EXG stuff and add unittests