Issue #52. Branch Iss52. Update Testing cases.