Update cucumber test with new ingest step. Fix various bugs