a bit of cleanup of the loader spec, along with stuuuubs!