Moving autolaoder back to bootstrap for tests