Add testing with fixture
update the unit testing