Fix unexpectedValue

Change unexpectedValue errors of switches to have value property