Remove options from CLI, add lextest