first commit with kartik
added more unit tests