Fix for Issue #16 and #18. Adding tests for highlight

Signed-off-by: nishtha <nishtha2479@gmail.com>