Changes to App libs and test scripts