Drop hardcorded test lookups