Fixed problem with shared instance being nil unexpectedly

Disabled two unit tests because they misbehave with Notifications being fired off