Use multiple return values in tests and README