Nii - refactored tests for more realistic scenarios