Fixing test cases for 1.6.0.SNAPSHOT