Added new functions
Fixed some unit test featured for CI