Removed lots of errors from dataset tests