Make Test more expressive