Fix btrfs grub tests

This patchset is intended to fix any failing btrfs tests and add some more comprehensive testing. Currently a work in progress.