Added some models modifications and tests corrections.