Reverted part of "Refactor input context tests"