Fixed a minor bug on tests
Script review and some options addition