Fix tests
Upgrade scala; change testsuite; rename