Add multiple tests and fix endToken issues

Closes #3
0.2.0