Added toy dataset tests. Relevant modifications.