Apply some review comments
Adding missing parameter to UT
Merge pull request #2 from andrerod/anu

Apply some review comments