Clean up test, add remove method to CommandHandler