Command line update + tests