Fixed tests, some comments regarding a code...