Add test script
Change output formatting