Fixed dataset separator in function call grammar.
Few tests added.