This seems even better to me. 3 Assertions less.
Some re-organisation into one single solution

will use this form in future