adding some new options and fixing unit tests