Minor changes

Improve resolvers in SBT build (keep builtins) and fix tests.