Clean-up and import of previous methods
More dataset tests