Switch to FA style AAA comments
Rename test methods to When_should_xxx pattern