Origin check in.
Added entity and entity implementation tests