Updated test scripts, added JMW