fix generators / add more tests