PDB-234 Cleanup after mergeup

Signed-off-by: Ken Barber <ken@bob.sh>
PDB-234 Make tests pass

Signed-off-by: Ken Barber <ken@bob.sh>