#95 MainTest is turned on

Some changes are made, but for the moment MainTest is not passed due to AmazonServiceException