Additional changes to get test to pass. This test has exposed a problem with the EngineerStore singleton. There is a race condition. Attempted to resolve the problem, but still failing. Need better dependency injection, and Singleton Pattern is problematic. Next will convert Singleton to a single instance allocated in the AppDelegate and pass to ViewController, etc.