More cleanup for tests / datasets