New tests added for trying fixes