Improved typing to parse the classes definition environment, and tested this part