Added additional Netgiro options and tests