Improve tests to be more consistent with existing ones.
Add one more test