cleaned up spin lock for new message, found problem with Test loading
data