Issue ITTE-458

Changes on the names of the test classes.