UnitTests: Updates class names and method signatures
Merge remote-tracking branch 'origin/develop' into issues/250-null-relationships

Conflicts:
	Simperium.xcodeproj/project.pbxproj