Modified return values for testing