Save tests and a fix to the method