add some tests
fix todo; enable tests