Cleaned up test scripts