Testing updates and fixes