Modified scripts to run directly from server
Added test script