Cleaned up and Added a test launcher for further use !