Branch b1_6

b=13537
i=grev

The old test was using the used space rather than free space. This fixes
that and also cuts the amount by half, so we don't completely fill up the
fs. It also caps the size at 1GB, like the previous version.