fixed tests, minor bindeps changes