Final commit + Test script