Update test to cover all returned values