Several updates to test process.