Start passing the level to the loaders
A little test cleanup