* Initial Change * Add UTs * Remove macro file as it is not needed * Initialise local vars * Update comment