Minor rework on tests