test classes renamed in order to follow naming conventions