Unit test part updated. Require more work