Fix stats
Fix from_str in Taker

Add some tests to options_parser_test