Added unit tests and few more options to functions.