Expanded Classit test