Updates to gems for tests
Fix merge conflicts

Conflicts:
	log/test.log