fixed options parsing unit tests and added more