Make tests strict again