finish tie framework restructure and add more tests