Add check to ensure a @class declaration is not already defined as a type
Update test cases