add new tests
update from master
remove Context, add tests