Tests updated.
First step of implementation.