Adding MadsName Internal class. Updating the tests and the reference