Fix test case in Scala 2.11
Upgrade submodules