Add exit command test
Change variable naming