Improved Unit tests