Fixed some tests, made others not fail for dataset.py