changes in code and new test examples