Remove duplicate message, add dependant option andworking test coverage