Tests Improvments
	- Adds missing tests