Tests improved

Datasource files renamed
New tests created