CDB-2891 Moar fixes + test that no longer applies removed