Add test generator. Also add tests and reorganize some of the old test filenames