Add test for option terminator
Update roadmap