fixes
Unit tests improved