Some progress towards getting Propono tests to pass.