Added data variables to the Model classes, implemented new Ghost
classes, updated GhostTest