Test Fixes
	- Fixes tests related to the generator