Added new unittest datasource. Code refractoring.