dependency fixes and task combining.
test improvements