altered test with race condition
Merge branch 'master' of github.com:DamianMac/Nimbus