Fixed cli parser so that it add watch, ignore, etc
Updated tests to read new options location