added option tests => fixed option bugs