Minor changes that fixes tests (or add more tests) broken from past changes
This will create a new commit in order to revert the existing changes.
