Removing console.log calls + Fixing tests