REFACTOR dataset
FIX test finishes when connection problems
MERGE