Remove console.logs, fix tests