I really see how from a code perspective this is very well written. However, I feel by removing the comments Given, When, Then, we're losing that simple quick readable way to identify what a test does. What do you feel?