cleanup
use aether resolver
test fixes