Tests definition improved.
Start to implement tests.