Re-added test script but slightly better