Refactored variable names in Intents Api. Added unit tests for Intents Api. refs #6