Fixing failing test scripts