Fixed test data inconsistencies and added a few try/catches where appropriate.