Evernote tests fixes

More tests fixes cherrypicked from EN branch