- Fix to FP-198;
- some test refactoring.