ENH: improving tests, connecting reading with raw construction