Fixed failing test cases
Preparing release 2.0-M3