--run implemented for command-line + test; issue 500; also removed erroneously added templates