Fix: unittest refactored and added