Removed some unit test and made changes to the main method.