diff --git a/lang/js/BrowserTestExtension/tests/encryptTest.js b/lang/js/BrowserTestExtension/tests/encryptTest.js
index 5ef68a32..521ed276 100644
--- a/lang/js/BrowserTestExtension/tests/encryptTest.js
+++ b/lang/js/BrowserTestExtension/tests/encryptTest.js
@@ -1,158 +1,156 @@
 /* gpgme.js - Javascript integration for gpgme
  * Copyright (C) 2018 Bundesamt für Sicherheit in der Informationstechnik
  *
  * This file is part of GPGME.
  *
  * GPGME is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * GPGME is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  * SPDX-License-Identifier: LGPL-2.1+
  */
 describe('Encryption', function () {
     it('Successful encrypt', function (done) {
         let prm = Gpgmejs.init();
         prm.then(function (context) {
             context.encrypt(
                 inputvalues.encrypt.good.data,
                 inputvalues.encrypt.good.fingerprint).then(function (answer) {
                     expect(answer).to.not.be.empty;
                     expect(answer.data).to.be.a("string");
                     expect(answer.data).to.include('BEGIN PGP MESSAGE');
                     expect(answer.data).to.include('END PGP MESSAGE');
                     context.connection.disconnect();
                     done();
                 });
         });
     });
 
     it('Successful encrypt 5 MB', function (done) {
         let prm = Gpgmejs.init();
-        let data = bigString(5);
+        let data = fixedLengthString(5);
         prm.then(function (context) {
             context.encrypt(
                 data,
                 inputvalues.encrypt.good.fingerprint).then(function (answer) {
                     expect(answer).to.not.be.empty;
                     expect(answer.data).to.be.a("string");
                     expect(answer.data).to.include('BEGIN PGP MESSAGE');
                     expect(answer.data).to.include('END PGP MESSAGE');
                     context.connection.disconnect();
                     done();
                 });
         });
     }).timeout(10000);
 
-/**
     it('Successful encrypt 20 MB', function (done) {
         let prm = Gpgmejs.init();
-        let data = bigString(20);
+        let data = fixedLengthString(20);
         prm.then(function (context) {
             context.encrypt(
                 data,
                 inputvalues.encrypt.good.fingerprint).then(function (answer) {
                     expect(answer).to.not.be.empty;
                     expect(answer.data).to.be.a("string");
                     expect(answer.data).to.include('BEGIN PGP MESSAGE');
                     expect(answer.data).to.include('END PGP MESSAGE');
                     context.connection.disconnect();
                     done();
                 });
         });
     }).timeout(20000);
-*/
-/**
-    it('Successful encrypt 30 MB', function (done) {
-        // TODO: There seems to be a limit imposed at least by chrome at about 21 MB
+
+    it('Successful encrypt 50 MB', function (done) {
         let prm = Gpgmejs.init();
-        let data = bigString(30);
+        let data = fixedLengthString(50);
         prm.then(function (context) {
             context.encrypt(
                 data,
                 inputvalues.encrypt.good.fingerprint).then(function (answer) {
                     expect(answer).to.not.be.empty;
                     expect(answer.data).to.be.a("string");
                     expect(answer.data).to.include('BEGIN PGP MESSAGE');
                     expect(answer.data).to.include('END PGP MESSAGE');
                     context.connection.disconnect();
                     done();
                 });
         });
     }).timeout(20000);
-*/
 
     it('Sending encryption without keys fails', function (done) {
         let prm = Gpgmejs.init();
         prm.then(function (context) {
             context.encrypt(
                 inputvalues.encrypt.good.data,
                 null).then(function (answer) {
                     expect(answer).to.be.undefined;
                 }, function(error){
                     expect(error).to.be.an('Error');
                     expect(error.code).to.equal('MSG_INCOMPLETE');
                     context.connection.disconnect();
                     done();
                 });
         });
     });
 
     it('Sending encryption without data fails', function (done) {
         let prm = Gpgmejs.init();
         prm.then(function (context) {
             context.encrypt(
                 null, inputvalues.encrypt.good.keyid).then(function (answer) {
                     expect(answer).to.be.undefined;
                 }, function (error) {
                     expect(error).to.be.an.instanceof(Error);
                     expect(error.code).to.equal('MSG_INCOMPLETE');
                     context.connection.disconnect();
                     done();
                 });
         });
     });
 
-
     it('Sending encryption with non existing keys fails', function (done) {
         let prm = Gpgmejs.init();
         prm.then(function (context) {
             context.encrypt(
                 inputvalues.encrypt.good.data,
                 inputvalues.encrypt.bad.fingerprint).then(function (answer) {
                     expect(answer).to.be.undefined;
                 }, function(error){
                     expect(error).to.be.an('Error');
                     expect(error.code).to.not.be.undefined;
                     expect(error.code).to.equal('GNUPG_ERROR');
                     context.connection.disconnect();
                     done();
                 });
         });
     }).timeout(5000);;
 
-    it('Overly large message ( >= 48MB) is rejected', function (done) {
+    it('Overly large message ( > 65MB) is rejected', function (done) {
         let prm = Gpgmejs.init();
         prm.then(function (context) {
             context.encrypt(
-                bigString(48),
+                fixedLengthString(65),
                 inputvalues.encrypt.good.fingerprint).then(function (answer) {
                     expect(answer).to.be.undefined;
                 }, function(error){
                     expect(error).to.be.an.instanceof(Error);
-                    // TODO who is throwing the error here?
-                    // It is not a GPGME_Error!
+                    // expect(error.code).to.equal('GNUPG_ERROR');
+                    // TODO: there is a 64 MB hard limit at least in chrome at:
+                    // chromium//extensions/renderer/messaging_util.cc:
+                    // kMaxMessageLength
                     context.connection.disconnect();
                     done();
                 });
         });
     }).timeout(8000);
+
     // TODO check different valid parameter
 });
diff --git a/lang/js/BrowserTestExtension/tests/inputvalues.js b/lang/js/BrowserTestExtension/tests/inputvalues.js
index 38ee6aad..52e3a7b0 100644
--- a/lang/js/BrowserTestExtension/tests/inputvalues.js
+++ b/lang/js/BrowserTestExtension/tests/inputvalues.js
@@ -1,130 +1,143 @@
 /* gpgme.js - Javascript integration for gpgme
  * Copyright (C) 2018 Bundesamt für Sicherheit in der Informationstechnik
  *
  * This file is part of GPGME.
  *
  * GPGME is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * GPGME is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  * SPDX-License-Identifier: LGPL-2.1+
  */
 
 var inputvalues = {
     encrypt: {
         good:{
             data : 'Hello World.',
             // Fingerprint of a key that has been imported to gnupg (i.e. see testkey.pub; testkey.sec)
             fingerprint : 'D41735B91236FDB882048C5A2301635EEFF0CB05',
             data_nonascii: '¡Äußerste µ€ før ñoquis@hóme! Добрый день',
 
             // used for checking encoding consistency in > 2MB messages.
             data_nonascii_32: [
                 'K€K€K€K€K€K€K€K€K€K€K€K€K€K€K€K€',
                 'µ€µ€µ€µ€µ€µ€µ€µ€µ€µ€µ€µ€µ€µ€µ€µ€',
                 '€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€',
                 '²³²³²³²³²³²³²³²³²³²³²³²³²³²³²³²³',
                 'µ€µ€µ€µ€µ€µ€µ€µ€µ€µ€µ€A€µ€µ€µ€µ€',
                 'µ€µ€µ€µ€µ€µ€µ€µ€µ€µ€µ€µAµ€µ€µ€µ€',
                 'üüüüüüüüüüüüüüüüüüüüüüüüüüüüüüüü',
                 'µAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA€',
                 'µAAAAµAAAAAAAAAAAAAAAAAAAAAAAAA€',
                 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAµ€',
                 'µAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA°',
                 '€AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA€',
                 'µ||||||||||||||||||||||||||||||€',
                 'æſæſ³¼„¬“³³¬“¬½”æſæſ³¼„¬“³³¬“¬½”'
             ]
         },
         bad: {
             // valid Hex value, but not usable (not imported to gnupg, or bogus fingerprint)
             fingerprint: 'CDC3A2B2860625CCBFC5AAAAAC6D1B604967FC4A'
         }
     },
     init: {
         // some parameters
         invalid_startups: [
             {all_passwords: true},
             'openpgpmode',
             {api_style:"frankenstein"}
         ]
     }
 };
 
-// (Pseudo-)Random String from a Uint8Array, given approx. size in Megabytes
-function bigString(megabytes){
-    let maxlength = 1024 * 1024 * megabytes;
+// (Pseudo-)Random String covering all of utf8.
+function bigString(length){
+    var uint = '';
+    let arr = [];
+    for (let i= 0; i < length; i++){
+        arr.push(String.fromCharCode(
+            Math.floor(Math.random() * 10174) + 1)
+        );
+    }
+    return arr.join('');
+}
+
+function fixedLengthString(megabytes){
+    let maxlength = 1024 * 1024 * megabytes / 2;
     let uint = new Uint8Array(maxlength);
-    for (let i= 0; i < maxlength; i++){
-        uint[i] = Math.random() * Math.floor(256);
+    for (let i = 0; i < maxlength; i++){
+        uint[i] = Math.floor(Math.random()* 256);
     }
-    return new TextDecoder('utf-8').decode(uint);
+    let td = new TextDecoder('ascii');
+    let result = td.decode(uint);
+    return result;
 }
 
 // (Pseudo-)Random Uint8Array, given size in Megabytes
 function bigUint8(megabytes){
     let maxlength = 1024 * 1024 * megabytes;
     let uint = new Uint8Array(maxlength);
     for (let i= 0; i < maxlength; i++){
         uint[i] = Math.random() * Math.floor(256);
     }
     return uint;
 }
 
 // (Pseudo-)Random string with very limited charset (ascii only, no control chars)
 function bigBoringString(megabytes){
     let maxlength = 1024 * 1024 * megabytes;
-    let string = '';
+    let string = [];
     let chars = ' 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
     for (let i= 0; i < maxlength; i++){
-        string = string + chars[Math.floor(Math.random() * chars.length)];
+        string.push(chars[Math.floor(Math.random() * chars.length)]);
     }
-    return string;
+    return string.join('');
 }
 
 // Some String with simple chars, with different characteristics, but still
 // expected to occur in an averag message
 function slightlyLessBoringString(megabytes, set){
     let maxlength = 1024 * 1024 * megabytes;
-    let string = '';
+    let string = [];
     let chars = '';
     if (set ===1 ) {
         chars = '\n\"\r \'';
     } else if (set === 2 ) {
         chars = '()=?`#+-{}[]';
     } else if (set === 3){
         chars = '^°/';
     } else if (set ===4) {
         chars = 'äüßµüþÖ~ɁÑ||@';
     } else {
         chars = '*<>\n\"\r§$%&/()=?`#+-{}[] \'';
     }
     for (let i= 0; i < maxlength; i++){
-        string = string + chars[Math.floor(Math.random() * chars.length)];
+        string.push(chars[Math.floor(Math.random() * chars.length)]);
     }
-    return string;
+    return string.join('');
 }
 
 // Data encrypted with testKey
 var encryptedData =
     '-----BEGIN PGP MESSAGE-----\n' +
     '\n' +
     'hQEMA6B8jfIUScGEAQgAlANd3uyhmhYLzVcfz4LEqA8tgUC3n719YH0iuKEzG/dv\n' +
     'B8fsIK2HoeQh2T3/Cc2LBMjgn4K33ksG3k2MqrbIvxWGUQlOAuggc259hquWtX9B\n' +
     'EcEoOAeh5DuZT/b8CM5seJKNEpPzNxbEDiGikp9DV9gfIQTTUnrDjAu5YtgCN9vA\n' +
     '3PJxihioH8ODoQw2jlYSkqgXpBVP2Fbx7qgTuxGNu5w36E0/P93//4hDXcKou7ez\n' +
     'o0+NEGSkbaY+OPk1k7k9n+vBSC3F440dxsTNs5WmRvx9XZEotJkUBweE+8XaoLCn\n' +
     '3RrtyD/lj63qi3dbyI5XFLuPU1baFskJ4UAmI4wNhdJ+ASailpnFBnNgiFBh3ZfB\n' +
     'G5Rmd3ocSL7l6lq1bVK9advXb7vcne502W1ldAfHgTdQgc2CueIDFUYAaXP2OvhP\n' +
     'isGL7jOlDCBKwep67ted0cTRPLWkk3NSuLIlvD5xs6L4z3rPu92gXYgbZoMMdP0N\n' +
     'kSAQYOHplfA7YJWkrlRm\n' +
     '=zap6\n' +
     '-----END PGP MESSAGE-----\n';
diff --git a/lang/js/BrowserTestExtension/tests/longRunningTests.js b/lang/js/BrowserTestExtension/tests/longRunningTests.js
index f67cbdf1..c95bebda 100644
--- a/lang/js/BrowserTestExtension/tests/longRunningTests.js
+++ b/lang/js/BrowserTestExtension/tests/longRunningTests.js
@@ -1,54 +1,65 @@
 describe('Long running Encryption/Decryption', function () {
-    for (let i=0; i< 100; i++) {
+    for (let i=0; i < 100; i++) {
         it('Successful encrypt/decrypt completely random data ' + (i+1) + '/100', function (done) {
             let prm = Gpgmejs.init();
-            let data = bigString(2);
+            let data = bigString(2*1024*1024);
                 prm.then(function (context) {
                     context.encrypt(data,
                         inputvalues.encrypt.good.fingerprint).then(
                             function (answer){
                                 expect(answer).to.not.be.empty;
                                 expect(answer.data).to.be.a("string");
                                 expect(answer.data).to.include(
                                     'BEGIN PGP MESSAGE');
                                 expect(answer.data).to.include(
                                     'END PGP MESSAGE');
                                 context.decrypt(answer.data).then(
                                     function(result){
                                         expect(result).to.not.be.empty;
                                         expect(result.data).to.be.a('string');
+                                        if (result.data.length !== data.length) {
+                                            console.log('diff: ' + (result.data.length - data.length));
+                                            for (let i=0; i < result.data.length; i++){
+                                                if (result.data[i] !== data[i]){
+                                                    console.log('position: ' + i);
+                                                    console.log('result : '+ result.data.charCodeAt(i) + result.data[i-2] + result.data[i-1] + result.data[i] + result.data[i+1] + result.data[i+2]);
+                                                    console.log('original: ' + data.charCodeAt(i) + data[i-2] + data[i-1] + data[i] + data[i+1] + data[i+2]);
+                                                    break;
+                                                }
+                                            }
+                                        }
                                         expect(result.data).to.equal(data);
                                         context.connection.disconnect();
                                         done();
                                 });
                         });
                 });
-        }).timeout(5000);
+        }).timeout(8000);
     };
 
     it('Successful encrypt 1 MB Uint8Array', function (done) {
         //TODO: this succeeds, but result may be bogus (String with byte values as numbers)
         let prm = Gpgmejs.init();
         let data = bigUint8(1);
         prm.then(function (context) {
                 context.encrypt(data,
                     inputvalues.encrypt.good.fingerprint).then(
                         function (answer){
                             expect(answer).to.not.be.empty;
                             expect(answer.data).to.be.a("string");
                             expect(answer.data).to.include(
                                 'BEGIN PGP MESSAGE');
                             expect(answer.data).to.include(
                                 'END PGP MESSAGE');
                             context.decrypt(answer.data).then(
                                 function(result){
                                     expect(result).to.not.be.empty;
                                     expect(result.data).to.be.a('string');
                                     expect(result.data).to.equal(data);
                                     done();
                             });
                     });
             });
     }).timeout(5000);
 
 });