Adjust build system and tests to work with scala 2.11