Minor bug fixes, updated tests, and prepare for s2 data ingestion.