Add tests. Create basic dataset tests
Complete dataset clean up