Made some slight changes to Main and MainTest