Resolve Smokey test failures