Fixed Entity level, add tests