Moved to command based system. Don't test by default