Updated main to include Test