Tried to make entity tests working but still have problems