Updated test scripts for easier testing.