Added more test and test comments