1) Moved Generators and their tests to i.generators package 2) added more tests for type generator