#JC-1915: Fixed code review remarks:
*Removed unused imports
*Added additional test case
*Corrected jsp indentations