(PDB-555) All tests passing again