Added additional tests to match other use cases