add; test suite, cleanup tmp files after generate