Added helpers for FluentAssertions

and rearranged things a bit