Remove harcoded test ids