added constants and function remove options. added tests