Entity test now uses all controllers