Initial tests and updated command-line with 'add'