Added test
Updated main program