Ditch ClassType
Write some basic test