Reorganizando unit tests.