Add tests, fix typos, simple tests pass now