Some more updates and a tmp test script