Reordered a few things and added another test.