Nits resolved and squashed

Squashed with unit test case fix and usage of private variable during the validation of account addition in calendar

nit errors resolved