Fix @lsanchez-r7's feedback, single expectation per test and avoid explicit use of subject