Fixed annotations.
Added tests for small generators.