Adding mock support and chainging order of options (sry)