PPLAN-1493: Fixed broken test. Updated documentation. Moved model classes. /Sara.