Added location tests for classes
Fixed class types in top level types