Updated test suite to work with Scala version 2.11 (fixes #26)