fix tests and a bug with datasources
binaries updated