Reorganizadas as classes de teste