Add else-if test
Change branch position data to be that of condition