More fixes, adjusted some test scripts