Reworked inner xml decoder a bit and updated test