Changes according Dominic's review notes:
- code formattig
- FIXME comments added
- more informative tests summary