Completed second test and new retVal logic