bug-fixes, addition of new test-cases