add first, not-yet-functional Scala test, make some cleanups