New test cases implementation.
Refactoring.