Added exception handling at cleanup (CLI). Added stoppoint in creating test.