Project ClassUtils tests and bug fix