Fixed test inclusion order