Clean up test assertions, break out another constant in Dataset class