mostly console.log updates and test script updates