Fixed test modules