added 4 parameter action support, updated tests