- resolved undefined opt issue;
- tests fixed;