Fixed return types in test