Update testing stuff
Add cli options