Create generators to type 5, implement some helper methods
Delete forgotten test files