Implementing review comments for TAJO-699 fix

Replaced tabs with spaces at few places.
Replaced assertEquals