Unit tests for some of the developments done in second half