fixing optionstest
a lot of few enhancements. testings are passing again
renaming classes. #6