standard return values; fix tests