[General]: Fixed unit tests