Update tests to account for the rename and extraction of the test fragment
Fix trailing whitespace
Add support for rank > 1 datasets that still only have one element