Remove some console.log, fix some tests