Resyncing with master.

Added some in progress test scripts