Added entities and entity testing controller