Merge pull request #12 from tlivings/master

Better tests generation and generator tests.
version