Fix unknown toggle method added + tests
Command line update + tests