Added more test stuff and tested xsl:choose: