Finished migration to dataset interface
Added test class migration to dataset interface