small cosmetics in data sink, GetData rewrited, fixed tests
small cosmetics in data sink, GetData rewrited, fixed tests