Modified/Renamed Project Certificate Mapping Tests, removed unused statements/variables