fix a context bug
updated tests
2.0.0