Added original TestMatos code removed from main project