GSoC idea: Drop test workarounds