WL-98
- Complete code coverage
- Update code for error and warning messages.
- improve code as per some suggestions