Add tests for sub generators